Skip to content

Fix incorrect if condition in the main package manifest #2217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Sep 19, 2023
Merged

Fix incorrect if condition in the main package manifest #2217

merged 1 commit into from
Sep 19, 2023

Conversation

Matejkob
Copy link
Contributor

@Matejkob Matejkob commented Sep 19, 2023 •
edited
Loading

This PR corrects the conditional logic for loading local versus remote dependencies in the Package.swift file.

I believe in PR #2200 we have merged the incorrect if condition in the Package.swift file.

@Matejkob
Fix local dependency resolution in the Package.swift
707af3c 
This commit corrects the conditional logic for loading local versus remote dependencies in the Package.swift file.
@Matejkob Matejkob requested a review from ahoppen as a code owner September 19, 2023 09:18
@Matejkob Matejkob changed the title Fix local dependency resolution in the Package.swift Fix incorrect if condition in the main package manifest Sep 19, 2023
@kimdv
Copy link
Contributor

kimdv commented Sep 19, 2023

@swift-ci please test

ahoppen
ahoppen approved these changes Sep 19, 2023
View reviewed changes
Copy link
Member

@ahoppen ahoppen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder how that change made it through CI. 🤔

@ahoppen ahoppen merged commit f8f274c into swiftlang:main Sep 19, 2023
@Matejkob
Copy link
Contributor Author

Isn't this flag turned on on the CI?

@ahoppen
Copy link
Member

ahoppen commented Sep 19, 2023

It should be, that’s why I’m wondering…

@Matejkob
Copy link
Contributor Author

So it just fetched remote version of the dependency - is some mechanism on the CI that would prevent building it?

@compnerd
Copy link
Member

This seems to have caused some issues on Windows - SWIFTCI_USE_LOCAL_DEPS is not defined, and we no longer can build the package: https://dev.azure.com/compnerd/swift-build/_build/results?buildId=61881&view=logs&j=186393e6-7c47-52d0-cbab-0f64f605ebf2&t=55352f38-40c8-5fcb-13f5-1be913c41525

This was previously working properly.

@compnerd compnerd mentioned this pull request Sep 19, 2023
Closed
@Matejkob
Copy link
Contributor Author

This PR should fix this problem - are you sure this build contains changes from this PR?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahoppen ahoppen ahoppen approved these changes

@kimdv kimdv kimdv approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Matejkob @kimdv @ahoppen @compnerd